include fix

include fix and new input map structure