WIP
Improved validation