Added wiki and user functionality