Big map rework. Incapsulate more fields and methods.