Moved behaviors for more reasonable structure