Removed dependency on POI