Add data handler from containers support