Removed redundant methods now validation is handled better