Updated and made Access classes better