Started adding basic and advanced tags