Sujit: changes to allow strong naming