Added facility functionality (untested)