Add modify and item methods. Simplify code.