Added implementation for the case where no class is passed as an argument at start