Feature mapping

Closes #622.