Made more architecture modifications