Rearranged settings + support for variable prefix