Added manipulation handling to queue