Override Evaluate

The Evaluate method is now overridden in order to provide a cleaner
interface.