Few more changes in model