Added data storage and Vector2