Temporary changes for fast loading