feat(update): latest changes from ngFactory
feat(update): latest changes from ngFactory