Further fixes class storage