Updates to abstraction