Tidy up content class
Add has showcase boolean field