Added Point object for easier maintenance.