Inner classes mapping feature (resolves #8)