changed a couple of maps + backward compatibility