Improved SmartModel

Added more predicates to the search facility.