Moved some parameters to architecture.py