Remove business rule P04
Modify U05
Update Database structure