Update program references
Update Map interface