restored old `on_add`. renamed `on_build` to `include_in_build`