Implemented new MappedOptionsHandler