Added extension class