Improving frontend and backend