Added support for caplets