updated the classes using Mutable string types