Added more usable behavior to add functionality (front-end)