Changes for compliance to new requirements