Added 2D math framework