FIX code dependencies on chosen module