Removed duplication, added class for array dot notation, improved sessions