Added basic functionality for registration