Added static map and tests