took care of motion parser in Spell.java and PersistService.java