Added support for dynamics