Stopped using Handles
They were supposed to encourage decoupling, but just removed type safty
and increased verbosity.