#396 Fixed supported keys for collections with a hardcoded index
#396 WIP addded support for adding items to collection
#396 Code format