Updated mappings. Ready for first beta.