Reduced selects and added validation