#43 Improve registration