Move towards RdioAccount style class