Updated system organization