Added some basic glue code