Removed dependency on validate