Updates in various places to implement polymorphy