Added optional class property