Remove underscore requirement