Modified tructure handling for recursion, events and honouring various keys