Added Converters and regex