making app ready for pluggability