Added mapping capabilities to language page