WASA to revamp revenue management system