[#48]: Improve User interface