Switched to a more object-oriented handling of expectations