Added base logic and test for base entities