Adding some compat support