Update to work with Serrano 2.1+