added support for extra features, including time