Removed duplication of mapping