Changed argument architecture.