Are we moving away from using decorators in Vector? If so, we should probably not use them here either.