Typeconverters and Metrics synchronization issue

Type Converters moved and code cleaned
Fixed Metrics issue with concurrent modification