Added List support and passing test cases