Added seed data plus small changes on entity definitions