Refactored LinerManager