Change from Movement to Cell in map update due to deprecated class.
Related to #1.