Modified structure and added prototype test