More work on Custom Items