I would prefer to have a separate class instead of an inner one...