Made work pages compatible