Further changes for Prototyping