Haproxy refactor