Some preparations for trinity_tbc support