Added service async solution, remove interception solution