Code refactored, New examples added