adding scope support (initial)