fix mandatory marker and update samples