AS7-4464: made methods into a proper map