Added basic mapping.