Removed depedency on validation - TO FIX later