Removed unnecessary fields. Updated validation