*Added logging in inner classes
*Added logging*