Added fill; support for numerical IDs