Refactorings. Added ImmutableList.