working on batch calls handling