Changes for presentation layer