Updated discussion pages and introduced image factory