Updated signin mapper and associated files