Refactored New Item With Improved Infrastructure