Add more comments and propperties