Add dynamic facilities, closes #159