Fixed related classes calls