Added stuff. Architecture changes