Added few more options and changed logging