Removed convoluted Account inheritcance in favour of simple one