updates: helpers and data class