Latest changes to get List and Post working