changes to support registration