Added support for Transparent mode
Refactor: Remove unused parameters