Added core and item keep support