Add more compatibility