Added scope and includes support