Made architecture a parameter