Minor changes & Hammer support