Changes related to new requirements