Removed dependency on account name and used env vars instead