Updating message type handling to make usage easier, adding keep-alive messaging