updated model with new features