Removed custom type and provider