Added event emmision for better extendability