Added support for workarounds