Added basic target mapping.