Updated with architecture and new stuff