Started adding support for live puppet image