#29: Simplified entity creation and moved compilance level to 1.8