Fixing bugs + redesigning service + support default values