added todos regarding relation.expand