Abstraction improvements