Added geometry base code