Improve the jsonform lib integration