Add mechanism to add states independent of __init()