Registration support added.