Attempt to add support for Emblem