Preparing message classes for modularity
added android empties