Move from memory map fields to methods