Adding scope support (initial)