Move key instantiation into key controller