Change: Login at start, separate xml for mapper