Modifications for NAR support, updated json usage