Fix for inner and private classes support