Improve LiveMaker support