Added Base64 support with id's