Add underscore separator support + enhance camel case support