Adding initial tags support