Adds scope support