Refactoring done for plate management