Adds AccountType to response data and resolves #37