Added fixture support