Changes to support more scala collections