Added factory function in Iceberg class, plus few mods on existing resources