Modified lists to use json