Completed enumeration method
Initial add
Added org.json dependency