Build System Updates/Add Roomservice Functions (Credit CM)