Several improvements in Orchestra