Make some classes public for GSON deserialization