Enhancement: Added support for context specific logging
Trivial: Restructured module header