Refactor tags module a bit

Add support for prep frame tags as well