Added feature control