Updates for greater flexibility