Major updates and ACF integration