Agreed, can make this generic on the next migration