- Changed hammer to use context