Inner classes added.