Added Point and Window classes and updated API