Improvements along with PIG-3158