Changed some Classes to do later some spring code