Implement APC content changes
Merge pull request #219 from timdegroote/apc-content-changes

Looks good, merging