Improve AVMessage class