Make inner class static to fix findbugs issue with non-serializable parent class