Added ability to enable and disable application code features