Get attributes layout up-to-date with develop changes