Rewrite to include all interfaces