add commented dummy classes and handle them