Feature/modify router