Improved annotations + storage class