Possible improvements to Officers