Improve item Architecture