Architecture Updated and bugs fixed