Add consideration for backwards compatability