Abstracted methods to base class, cleaned entity detection