Refactoring

. Track and container descriptors
. Command execution