Adding new model features and tests