Adding best practices compat