Implemented a None Rotating Map Discovery. Fixed Issues with not detecting correct Values.