better single associations handling