Added mapping and UI