Add support for abstractions