add proxy support
make the constants more readable