Optim and add like feature