Architecture Updated, bugs fixed and StrictMode