reorganization of methods handling