Adding bean accessors to make testing easier