WIP: Use the overriding attributes