Issue #534 - Added base entities