Added missing entity annotations

https://ortussolutions.atlassian.net/browse/CONTENTBOX-162