Fix build break due to removal of struct inheritance