Added support for snake case