Copied over from main repo for use with Alcatraz