crud generated, entities fixed