Removing magic string, using attributes intstead