Add traits for more clarity