All previous funcionality, except for notification registration