Refactor of class mc, added property in screenWrapper