BIS1002 Small enhancements according to client comments