Refactored IncomingMessage class/object construct