Add full support of proper mode with -p