Modify Code - Support Auth - Implementing