Updated handyman framework