Fixed comment field bug.
Revert "Fixed comment field bug."

This reverts commit 0d927de71b0624234a57b895c8455a88e5a7ec43.
Added catalogue & entity interface and abstract class.