Add by-name rebuilding of patches
Do some more working with hook