Fixed ResolutionMode ADT and moved over