Added proper support for pre-parsing model input