Added further code from meta branch.