Fixed includes and deprecated methods, functionality is not guaranteed!