Added requests handling and structure change