Re-added Vector Defines