Cleaned up AbstractModule & Entity API