Added class + modify properties