Add optional and provided scope

Fix for #10 
What would make it fail on <15?