added class for easier compatibility with new updates