Updated config and init files