Added rudimentary account handling