Fixed xapi commands from initialize, updated wrapper