Moved marker iteration to decorator for more flexibility