Cleanup
Added support for Diameter Time Type
Bugfixes