Enabling full mono compliance