First crack at adding extension attributes