Added improvment to database converter. Added tag parsing