Add support for underscore property names