updating models to handle all pricing features