Updated source structure