Move to meteor format