Additional changes that belong to first feature