Added support for unsupported features