Some more updates. Add vhba-hook