Added skeleton to manage events