fix reload support
fix dependencies, simplify helper