Modified controllers in order to use an async approach