Removed Compat dependency