Changed account access method, added account setup