Add logging, helpers and aliases handling method