Using better capability checks