Implementing new registration cost rules (fixes #73 and #74)