Removed Vector2D dependency