Adds compound attribute support