Re-factoring done for lab packages