Updated to Bottle API V2