Block create_create_data enhancements

This should fix issue #54
Greetings from the pool in France. ;-)