Add scopes and method to calculate progress