Added import mappings for java.util.Set and java.sql.Timestamp

Fixes issue #226