Fix entity crud operations