Add public_interface parameter....