Added better handling of associated records for singular associations