Adding support for "101" style