Adding some hybrid stuff