Adding loggin and filters