Removed Owner module, and added more Action options
Commented out schemas again