Improve entities (introduce constants and remove @Basic).
Minor changes.