Rest architecture changes