Feature config improvements