Added backwards compatability features with existing model structure