* working on removing System.Drawing dependency
* refactor
* handle Image usage