Added plumbing for Activities (issue #547)