Added preliminary geometry support