Added project scope handling