made changes to rest template and fields