Adjust mapping attribute check and migrate more specs