Add VM page and small logical changes