JSON warpper added, exceptions added