Feature/marker enhancement