add support for more required data