Added missing classes
Added missing checks