Some changes all classes will be refactored