Add class locator support, actual assert used removed CR and LF