Added credentials support