Included input_properties fix + support for MIGX from @JayCarney

just for easier merging, if you decide so