Added basic duration support