Fixed unpredictable deletion behaviour and basic creation logic