Added missing bits and pieces to get the external API running.