Add more complete shopfiy support