Added basic Geometry annotations.