Refactored scopes
Bumped version