Add inspectable class, remodel map input to understand new model