First push of generic glue code