Added support for contract