Refactoring! Adding support slowly for API 8+
Refactoring! Adding support slowly for API 8+