Improve integration of Item Abstraction a bit more