Switched from classes to a-lists