Added scope and unless tags