Refactoring, modem configurations added