Added comments and analytics