Added tags and cleaned up store() function