Avoid usage of inner classes