Added __init__
Fixed minor issues to let working the new account schema