Added State and Behavior