Make package, add message types