Updated initializer (cahced system)