Modifications for hosted version