Finish put function in Active mode, need future refactory