Fixed an issue with SchiderModel definition, code cleaning