Improve creating and adding mechanism. Added selection mechanism