Made changes for dynamic typing