Added custom world type handling