Added code for Star and Plus, now everything should work