Updates and attempts at fixing mapping