- implemented validation logic
- minor adjustments to entities