added dynamo support