Removed unneeded object, made location of credentials configurable