Refactored padding system.