Updated Device Sources with latest changes