Cyclomatic Complexity has been added
//TODO .. Refactoring & More functionalities