Added GPS module and data class updates