Aleksxor/feature/56852016 event to method