Added support for Origami 1.4