definitons changed to static map