Added initial support for message accounting