#16: Built-in Content definitions

Change request updated