Added todo in comments on credentials