Issue #98 - partial Account service support