Add more account specs, update account methods