Fixed a bug that was failing to return if the geometry was null; Removed unused packages from the Template model;