Added support for custom and default Ids