Data improvements and init systems