Added functionality for active marking

Signed-off-by: steigr <me@stei.gr>