Add ability to specify facility