Added has_one and has_many triggers