Added feature toggle