Refactoring and added a few new predictors