Added account related classes