Added one-to-many relationship support