refactored out the __info map