Minor Refactorings, add Published scope