Model state work
refactored PadModel into new map API