Switch to using attributes