Add database initializer
Fix step scope proxy issues