Fixing models

Making models compatible with the latest astropy model framework