More improvements on one-to-many relationships