Item controller refactor