add data_factory for static data and minor changes in code