Updated with 1.1. features