Added requests handling and structure change

But this will create error reaction all time