Improve subclassability by delegating methods from entry to main map Add support for serializable subclasses