Fixed validation errors and tested on most databases, good!