fixed bug with data directory
Uniqueness is validated now