List implementation is changed