Initial version
Added feature toggle