Add behaviors for storage