Updated to features 2.x

Signed-off-by: Jaison Shaughnessy <jaison@worxco.com>