Maybe add password support