Expanded GlAccountAndOrganization to include GlAccount