Modified to work with jsonform