Add slightly changed reflection back, validation, error reporting etc