Fixed Schema as per User story