Addes more generic tags to rmi example