Added few options support and manage other things