Add optional and provided scope

Fix for #10