Added stuff for hybrid