Changed some experimental API for better isolation and interface support