XML annotations
Use enums
Add query
Adding value queries