Change from actor to future style approach