IMPORTANT / Fixed very impacting NPE
MEDIUM / Added missing inspectors