Removind Account's dependency and adding _get_structure() function