Added some stuff to feature 1.1