Adding scope support