Extend API on @wilmoore's suggestion