Improved abstraction.