Added associations and one and a half queries