Updated for Genesis 2.0 compatibility