Working on user specified geometries
Added support for user defined geometries