added additiona infos
start refactoring consumers